Polishing the final touches...